don't compile third_party source

Forwarded: not-needed
Last-Update: 2019-08-06

Gbp-Pq: Name no_thirdparty.patch

diff --git a/Makefile.am b/Makefile.am
index f0ac83f2d08d987522ce83e8b842ef23819896f3..d389454f9d8495c4dfbc17b3e545abcc5a301ce6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = foreign
 SUBDIRS = . src
 
 # Always include third_party directories in distributions.
-DIST_SUBDIRS = src conformance benchmarks third_party/googletest
+DIST_SUBDIRS = src conformance benchmarks
 
 # Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
 # because then "make check" would also build and run all of gmock's own tests,

diff --git a/configure.ac b/configure.ac
index a86499a57127fb542179b5bd073e34e15410d8b4..df1bae58d980fab5066ffe6b6f82211e40fa6a7f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -228,7 +228,6 @@ AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
 #   too.
 export CFLAGS
 export CXXFLAGS
-AC_CONFIG_SUBDIRS([third_party/googletest])
 
 AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
 AC_OUTPUT